[automerger skipped] Merge "Added few more APIs support" am: cb23451c am: b1202b00 am: df28cf9c -s ours am: ef26b3ec -s ours am: 4d308abd -s ours

am skip reason: Merged-In Id3c0f3afc7a5fc95beb4dde0c570520626244761 with SHA-1 1f1f39be is already in history

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



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