Merge "[BR12] Use sdk level instead of aconfig flag" into main am: 34e3f2c4...

Merge "[BR12] Use sdk level instead of aconfig flag" into main am: 34e3f2c4 am: 52bdd6cf am: c7a766c7

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



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