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

Change-Id: I50aa465b82f628206749c86a0dd5ca50d56199ac