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

Change-Id: Iefa868c47f2d699a9ec4e0b7e86e1eaa9eee43d4