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

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

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

Change-Id: I734b999b5c7d87de131268202b9eaf764d24799e