Merge changes from topic "presubmit-am-86d37df06f3b4cba87f03386fed73973" into...

Merge changes from topic "presubmit-am-86d37df06f3b4cba87f03386fed73973" into sc-mainline-prod am: 49683c1e

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



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