Merge "DO NOT MERGE - Backport master API changes" into tm-qpr-dev am: 11502246

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



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