Android Mainline 12.0.0 Release 55 (7929774,com.google.android.tzdata2)
Merge "Convert external/neven/Android.mk file to Android.bp file" am: b71d4e6acf am: 28adb05bcc
am: 07b172807c

Change-Id: I182c866c2e877c997d78bda9e85e2ca0ebf12b5a