[automerger skipped] Merge "DO NOT MERGE - Backport master API changes" into...

[automerger skipped] Merge "DO NOT MERGE - Backport master API changes" into tm-qpr-dev am: 11502246 am: c28a1327 -s ours

am skip reason: subject contains skip directive

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



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