Merge changes from topic "presubmit-am-37de191e8f264fc2890d1cc94278eaff" into...

Merge changes from topic "presubmit-am-37de191e8f264fc2890d1cc94278eaff" into sc-qpr1-dev am: e531ea8f am: 1142d566 am: 1e5a603f am: b736b361

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



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