Merge changes I4cbf9376,Ief2111ec into sc-dev am: dec5d61e3a am: a4a6aa7e60 am: 9ec41071f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15096008 Change-Id: I5d1d4effe4af1c04501c6dc78b886ab0c20a5e2a
This commit is contained in: