Merge "Enforce min_sdk_version=29" am: b204af534b am: 067448a56c

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

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