Merge changes from topic "presubmit-am-63cee7df41274a07a7523570348ebb84" into sc-qpr1-dev am: 778427a0c3 am: db8e670f50
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16285651 Change-Id: I2f1f7d118059b06fb2a497a3119bfe370f9e8c4f
This commit is contained in: