Android Mainline 12.0.0 Release 112 (8426387,com.google.android.tzdata2)
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 08712e6e13 -s ours
am skip reason: subject contains skip directive

Change-Id: I14f624bb8a9974ae97c90dcae768512e5be16f5e
tree: bd0725018d01a52d7b6cc2b5dbfb44e1e4e98320
  1. 6515/
  2. 65xx/
  3. Android.mk