tree c26ad6323ad945ad9036885c354c8a3577a93c39
parent bd68fac987bc9201ffefa9c201de27c9c95d2fbb
parent 60361a11eb86703876155aa7e0dda00b8add0620
author Iván Budnik <ivanbuper@google.com> 1667922989 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1667922989 +0000

resolve merge conflicts of ef33f4c1c856cc9c965adda1fa0f393e16c45fba to tm-dev am: 7647712c61 am: 60361a11eb

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

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