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

Merge changes from topic "presubmit-am-bf2c168d3e474b609f72a06f73ec50e2" into sc-qpr1-dev am: b0db165d am: 6907e85e am: d73ef8a7

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

Change-Id: I1abbabdf44210f72c54ae075a4025e22673ae542