[automerger skipped] Use renamed APIs am: d2d2ef4e -s ours am: 5788b688 -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: I120726cbe2a626957d1e7cda676fb97fe8bde173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>