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

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

Change-Id: Ie1c6f67c68c1b42c86b45874d720956c49c091cc