Merge "Merge changes from topic...

Merge "Merge changes from topic "presubmit-am-86d37df06f3b4cba87f03386fed73973" into sc-mainline-prod am: 49683c1e am: eb0b5f2b am: 2b365bc7" into udc-dev am: b1e8c55a

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



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