[automerger skipped] Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into sc-qpr1-dev am: 214ad884 am: e070aa49 am: 8f3f0202 am: 35dd64a9 -s ours am: 391b9810 -s ours am: d45e7b33 -s ours am: ecc284cc -s ours

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

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



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