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

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



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