Merge "[BR12] Use sdk level instead of aconfig flag" into main am: 34e3f2c44c am: 7d69fd2598

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

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