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

Change-Id: I085c58963b647bbdf5c4cc710fbbf037f5d806f9