tree f73f69b3476cfc75c7bab491007589befb4e0489
parent fe5fd53865070b027bdbc834ede9d73e51b40569
parent cf968994312cbed879190e53303c5ac1e7aa8b79
author Xin Li <delphij@google.com> 1614816735 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614816735 +0000

[automerger skipped] Merge "Merge RQ2A.210305.007" am: 48172e9b5d -s ours am: cf96899431 -s ours am: 49ceda904a -s ours

am skip reason: Change-Id I2958205678f4340e96ce6e845718e994a0231afc with SHA-1 9882ff4bf8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I988e8a4b397af4360da97e97c79307ba62b155f6