Merge "Add OemExtension callbacks support" into main am: e2e3170c54 am: e2ff57abe0

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

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