Merge changes from topic "presubmit-am-59a480c9f2b640759c6bbe002266b875" into...

Merge changes from topic "presubmit-am-59a480c9f2b640759c6bbe002266b875" into sc-qpr1-dev am: 98071983 am: 792280e2 am: 7aa9747a

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



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