Merge changes from topic "261990919" into tm-qpr-dev am: 938aed25 am: 8bb840de

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



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