Merge changes from topic "presubmit-am-0ba418188bf14da5b3177de2f43d7187" into sc-qpr1-dev am: db5a6ff1f5 am: 7885034cbb am: 44e542c6c3

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

Change-Id: Ide58851a3bb146cd57b388c5da280f59dd68ee47