Merge changes from topic "presubmit-am-07fbc24475da4c549999999d34e98894" into sc-qpr1-dev am: 20b7fa7d am: fa0006d6

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

Change-Id: I3c8d89024367e49cc7ed20f09a596ba246253fff