Merge changes I2516e8d2,I6c4f5c93 into sc-v2-dev am: af816a74d6 am: 21f7271e18

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

Change-Id: I889d8a3d20d158e65eac9cbe3e590eedb7947a2f