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

Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into sc-qpr1-dev am: 214ad884 am: e070aa49

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



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