Merge changes from topic "presubmit-am-a62a1375dec9427ba5398fef38c87ad3" into...

Merge changes from topic "presubmit-am-a62a1375dec9427ba5398fef38c87ad3" into sc-qpr1-dev am: f1854137 am: 5dc3e730 am: dbc94fd2 am: 75beb83d am: bb281ea5

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



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