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

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

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



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