tree 53fdf081281e697992624d0bc618daee3108d8ef
parent bb1bb44c00d616db357185a59c4c75850dc48628
parent ffdfacae548b032d369d8f2bd6d7093fda250fe3
author Xin Li <delphij@google.com> 1644885322 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644885322 +0000

[automerger skipped] Merge "Merge SP2A.220305.012" into stage-aosp-master am: 5409ef1ab7 -s ours am: ffdfacae54 -s ours

am skip reason: Merged-In I748fdd49626acaa0e986a9d8038039cada6faa60 with SHA-1 8f368c5358 is already in history

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

Change-Id: I161aaec86e2c2b2a9e60d4022e3ee09d5307e9dc