Merge changes from topic "cherrypicker-L70100000956505250:N87500001297085156"...

Merge changes from topic "cherrypicker-L70100000956505250:N87500001297085156" into tm-qpr-dev am: dbf61511

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20008784



Change-Id: I1564237ab1a61007ab042dd8b009b0dcf56981d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>