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

Change-Id: I01befbf67dcf0fe8acc3202b09b61be70004564c