Merge changes I9ef21efc,Id762ed7b into sc-v2-dev am: 77f1abd1f9

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

Change-Id: I0354de9107bebf1be0406fc2835eb284c5e81740