Android Mainline 12.0.0 Release 54 (7920728,com.google.android.tzdata)
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 052ede55d1 -s ours
am skip reason: subject contains skip directive

Change-Id: Id52833b4f87bbd5abbb71b773a59744c1e5dccb1