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

Change-Id: I7eca92d2ce0e08266a185e61566201fbfaf1acdb