Merge "[framework] rename some oemCallback and fix javadoc typo." into main...

Merge "[framework] rename some oemCallback and fix javadoc typo." into main am: 59a332c5 am: 639f366a

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



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