Merge "Add OemExtension callbacks support" into main am: 3dbf4cabdb am: f89deb9dd4

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

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