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

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

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