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

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

Change-Id: I53005e72c0a325c48456b190dd92314fc32141ef