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

Merge changes from topic "presubmit-am-1b5cf7c12da84505927afb0314fbb5cf" into sc-qpr1-dev am: d3f77028 am: 4dfa6e76 am: 8bc1a21b

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

Change-Id: Id4cb3ed5e63d3380a5c48d23db899584eba9f300