[automerger skipped] Use renamed APIs am: d2d2ef4e -s ours

am skip reason: Merged-In Ib71325b802fccf40e517ed230c65a9e840bd2e1a with SHA-1 16d7941c is already in history

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



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