Merge cherrypicks of ['partner-android-review.googlesource.com/3004014', 'partner-android-review.googlesource.com/3027810', 'partner-android-review.googlesource.com/3018051', 'partner-android-review.googlesource.com/3036370', 'partner-android-review.googlesource.com/3037071', 'partner-android-review.googlesource.com/3048758', 'partner-android-review.googlesource.com/3063573', 'partner-android-review.googlesource.com/3063574', 'partner-android-review.googlesource.com/3063575'] into sparse-12653312-L40200030010309035. SPARSE_CHANGE: I16e39dab63ae017ba50961a606896b17dfa4329f SPARSE_CHANGE: I3c3ee7d1ac0f081ca47377d81f7066adf4765487 SPARSE_CHANGE: I10b9fc09fe21252c4a3efcb9103ae7cd93996e08 SPARSE_CHANGE: I5669b4c1e39cdb33cf01df60855067fa62984758 SPARSE_CHANGE: Iacd07484a9a9a00d7d4b5d91e2e0efc6bd918409 SPARSE_CHANGE: Ic3565d9e376fdcab2ca80b1eb2488567e79f5d8b SPARSE_CHANGE: Ibb38308ba5359e25e3ebb9047f80a75a6927da4e SPARSE_CHANGE: I65d0749e12c4c453d3f2790e01e11230457a5b41 SPARSE_CHANGE: Iaf4c601380a809b6d49100e008edbee82aa183c7 Change-Id: Ie22d1fbd71ad78811025873b2e467b4a655d2867 Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>