[automerger skipped] Merge "Use renamed APIs" into main am: 6ef95d6c -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: I510d8cb122d9b5d24191daf2a66b5ddc4c24dbc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>