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

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

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



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