Merge changes from topic "presubmit-am-8fce4e975b58476c9f42996d277b3173" into...

Merge changes from topic "presubmit-am-8fce4e975b58476c9f42996d277b3173" into sc-qpr1-dev am: 9b4d98a5

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

Change-Id: I1c6fec686628b0f2deb4583180d594a5352bdacd