Merge changes I93374f42,I0a1ae320 into sc-v2-dev am: 079c69e4b5

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

Change-Id: I05a29021c92b9df2f99a3759773a5d6c5f51b279