Merge "[framework] Add more oem extension APIs" into main am: e40e1b29fa am: f6b542e047

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

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