Merge changes from topic "presubmit-am-9b95e1db2c474672a9f1a4c7c43d99d0" into...

Merge changes from topic "presubmit-am-9b95e1db2c474672a9f1a4c7c43d99d0" into sc-qpr1-dev am: 87b6e36d

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

Change-Id: I199ea0c9e50e2d7df5167f7cbaf26476f6bcd6c6