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: 7d69fd25 am: 70088839

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



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