[automerger skipped] Fix implementation reference am: 7841d10c8e am: ea76db734f -s ours am: 31485a9c11 -s ours

am skip reason: Merged-In Id07b18a98fd5ca925bb00683ec8ec0c31b0e44d0 with SHA-1 7841d10c8e is already in history

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

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