Merge changes from topic "presubmit-am-d8e1f50ef5264701a2f9994dfc715425" into...

Merge changes from topic "presubmit-am-d8e1f50ef5264701a2f9994dfc715425" into sc-v2-dev-plus-aosp am: fa749e73 am: 894e925f

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

Change-Id: I1c009cc0b8708cd20f7868b6309ff66a69ece689