Merge changes from topic...

Merge changes from topic "cherrypick-cherrypick-attrTokens-xdkc7c9ixz-3kymu67epe" into sc-qpr1-dev am: 0dd8a790 am: 066b27ff am: 42cbd4cf am: a9ad071c am: 41741403

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



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