Merge changes from topic "presubmit-am-e1fc50fa0faa4d99aa3c954335c1c49a" into...

Merge changes from topic "presubmit-am-e1fc50fa0faa4d99aa3c954335c1c49a" into sc-qpr1-dev am: 7a129483 am: a80eecdd am: f9758d0b

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

Change-Id: I3f1aeb5fe1741b72426e14899ba2ebaa9d95daee