Merge "Merge changes from topic...

Merge "Merge changes from topic "presubmit-am-361ce2f2beb3432cae0398341bab71ca" into sc-qpr1-dev am: 324903d9 am: c297a9ef am: e1e0ae15 am: 5ca32eaa am: 7a9f5ba0 am: fd1c743a" into udc-dev-plus-aosp am: 4297e517 am: 17c68df0

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



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