Merge changes from topic "presubmit-am-ef6979eb0d794319a4c16a36a338836c" into sc-qpr1-dev am: b448864515

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

Change-Id: I277d336a6978056b31e63b5a7eb903e0930354d4