Merge cherrypicks of ['googleplex-android-review.googlesource.com/22919959', 'googleplex-android-review.googlesource.com/24737501', 'googleplex-android-review.googlesource.com/24737502', 'googleplex-android-review.googlesource.com/24737503', 'googleplex-android-review.googlesource.com/24737504', 'googleplex-android-review.googlesource.com/24737505', 'googleplex-android-review.googlesource.com/24638916', 'googleplex-android-review.googlesource.com/24638579', 'googleplex-android-review.googlesource.com/23356997', 'googleplex-android-review.googlesource.com/24234506', 'googleplex-android-review.googlesource.com/24972364'] into security-aosp-tm-release.
Change-Id: I142169e5149703456243dd64c09a14453e5ae332
