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

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

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



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