tree 33397654b1c0c9bb0f2bbd45ae13ca04852f05e6
parent 6ce4ea8b43d276642354552912956cddfd01495b
parent 558219eca00b75fd887fa59a4fc043124fee00ae
author Mariia Sandrikova <mariiasand@google.com> 1674826475 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1674826475 +0000

Merge changes I2a8688e7,I6d831706 into tm-qpr-dev am: 558219eca0

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

Change-Id: Ibf951b3d8994914d0ae3da76f494bbccb3fff3f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>