[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "lockdown-mode-qt-dev-rvc-dev-sc-dev" into tm-dev am: 5ada3e16 -s ours am: f45ee071 -s ours

am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 02771b7f is already in history

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



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