[automerger skipped] Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into sc-qpr1-dev am: 214ad884 am: e070aa49 am: 8f3f0202 am: 59882f5e am: cc0438c7 -s ours am: 93b82d91 -s ours am: 54f53988 -s ours am: 9e31f5a6 -s ours am: 92226aef -s ours

am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e4 is already in history

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



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