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

Change-Id: I81f0670a04da22d1f4df6d3fa4312961e2e6ed2b