Merge changes from topic "presubmit-am-1bdc6596abc94ed48e398e34bf8604a6" into sc-qpr1-dev am: 723b27a1

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

Change-Id: Ida79e39495635b2d9a5bb16b23993dc5e190a3ce