[automerger skipped] DO NOT MERGE - Backport master API changes am: 4f0cd1b0...

[automerger skipped] DO NOT MERGE - Backport master API changes am: 4f0cd1b0 am: f57a036c -s ours

am skip reason: subject contains skip directive

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



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