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