[automerger skipped] Merge changes If6a02209,Ied39acb0 into sc-v2-dev am: 5150828ce3 am: b2d4b016c2 -s ours

am skip reason: Merged-In If6a0220979d9f9df584c29f4adce317341577cf4 with SHA-1 f53ae1402a is already in history

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

Change-Id: I6b2bd0ecdf6701724b7ff5bdec7380ae7f133577