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

Change-Id: I292de2fbbf5d329fd43a452b0a4a5d2a1366f528