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

Change-Id: Ia4e8e68fd123b15d09eb46cdf74763dbc28057c3