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

Change-Id: I8e26114ce0adb39d6c3e1dc2292320f312111402