Merge "Adapt to changing function signature." into main am: af4b7de711

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

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