Merge cherrypicks of ['googleplex-android-review.googlesource.com/30596089', 'googleplex-android-review.googlesource.com/30595924', 'googleplex-android-review.googlesource.com/31157079', 'googleplex-android-review.googlesource.com/31105383', 'googleplex-android-review.googlesource.com/31095394'] into security-aosp-sc-release. Change-Id: Id2957e5db5cb4f939ae2a3ec84d16cbcf9d389a1