Merge "Provide complete API surfaces for *non-updatable compatibility checks"...

Merge "Provide complete API surfaces for *non-updatable compatibility checks" into main am: 67ee8348 am: 14a141cf

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



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