q_tzdata_aml_295600110 (9398985,com.google.android.tzdata)
Merge stage-aosp-master into pi-dev-plus-aosp
am: 1f34ac8f7b

Change-Id: Id64ac06dfc86f784d8307132584452dfb68f9a80