Merge changes Ia5accb74,Ic4d7def4,I30bd56fc into sc-v2-dev am: 7339a87bf3 am: 2b18ddbd1b

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

Change-Id: I1745d8adda977f90ef308e21c0dcc2e0ff0e1234