Merge cherrypicks of ['partner-android-review.googlesource.com/3016323'] into sparse-12820175-L22100030008640651.
SPARSE_CHANGE: I1fba3020c822257fd21ba7663cc7a46da75c6cee


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