Merge changes from topic "presubmit-am-972dcb5456b14246b20e89e741cf7eaa" into sc-qpr1-dev am: 8b9ef48f4b

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

Change-Id: I6d7909d6f59a4ce2b43cc599cca6435ede985a1e