Merge "Adapt to changing function signature." into main am: af4b7de7 am: 98914f7d

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



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