Merge cherrypicks of ['googleplex-android-review.googlesource.com/20942346'] into security-aosp-tm-release.

Change-Id: I0345c3cab93041c0aed0d4e9808fd72ea85fd68f