Merge "Raise minSdkVersion to fix lint error" into main am: 005ea3cf0b

Original change: https://android-review.googlesource.com/c/platform/development/+/2769081

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