Merge changes from topic "presubmit-am-63cee7df41274a07a7523570348ebb84" into sc-qpr1-dev am: 778427a0 am: 0951e0af

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

Change-Id: I8a4ce051a4557c4303b0e5abeb9a39e8a05ea71b