Merge changes from topic "presubmit-am-1bdc6596abc94ed48e398e34bf8604a6" into...

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

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

Change-Id: I5923329d09e98fdc5acea4f5cd89b8affc266f79