tree fadd263b3890cd135c47799851dbb4d0b5f06835
parent 4261d780755737a8cda930423e4c30fd745ff30a
parent 5a2d06b5f10203d952d1990a1f9154bd05e52fa5
author Michał Brzeziński <brzezinski@google.com> 1641304706 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641304706 +0000

Merge changes I76ea8651,I76a84b4f into sc-v2-dev am: 5a2d06b5f1

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

Change-Id: Icb93bf5e316bf3dfda06f53c53ce16c7bd68cfc7