Merge changes If6a02209,Ied39acb0 into sc-v2-dev am: 5150828ce3

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

Change-Id: I5c3705a856c5c0d932db2e62720656c71a885a50