Merge changes I59089884,I0ec61e11 into sc-v2-dev am: 7a8f7189e2 am: 97613d7c20

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

Change-Id: I0d96e1fbe36e0ab5f62a5e67246109bd1741d1e7