Merge changes from topic "trace-columbus-b253489562" into tm-qpr-dev am: 262e8c82 am: 70ded460

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



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