Merge changes from topic "presubmit-am-1b5cf7c12da84505927afb0314fbb5cf" into sc-qpr1-dev am: d3f77028 am: 4e4bf29c am: f3de30f9

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

Change-Id: I4710e9de805f645dd78f162863d381266a8fb06e