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

Change-Id: I1ef23379de9fc8f2db8e15878f63b11ca98fd315