Merge cherrypicks of ['partner-android-review.googlesource.com/3009288'] into sparse-12653312-L23900030008443640.
SPARSE_CHANGE: Idaf94d036ee26b4b7a39ddfc0743f4d770149d28


Change-Id: I02e00834fd3196532014fcd5249567f8d18e851d
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>