[automerger skipped] Merge "Backport of ag/14170751 and ag/14170752." into rvc-qpr-dev am: 3208605a -s ours

am skip reason: Merged-In I3c2b718905d2d7619d6f299ee5402fd858de030e with SHA-1 80005cd6 is already in history

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

Change-Id: I90f447370f6a4b208efdd0c73c59bd8ecd3e5da3