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

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

Change-Id: I4f4fc46f4207a5aa9a45be3465f965d70fe3beb2