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

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

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



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