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

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



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