Merge changes from topic "presubmit-am-63cee7df41274a07a7523570348ebb84" into sc-qpr1-dev am: 778427a0 am: db8e670f am: 057d4dab

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

Change-Id: I5b93b3eb4909d7be46dd3b6438ef6a66a24ad7c1