Merge changes from topic "presubmit-am-58d727f812d04fc3b6d1823862f6bf2f" into sc-qpr1-dev am: 3181e42d am: 6cadc549 am: 29ad78eb

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

Change-Id: I7aa345db8449ccf83d63a0ba85374894581c95b4