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

Change-Id: I176dc63568e3e494bd85eac2172dcd5778f2c12a