Merge changes from topics "265180342", "265979516_cts" into tm-qpr-dev am:...

Merge changes from topics "265180342", "265979516_cts" into tm-qpr-dev am: a9680091 am: e48ab2d2

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



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