Snap for 8730993 from c33cf5e7c922b6cdd17617f4c72bf72a88ca4390 to mainline-tzdata3-release

Change-Id: I93766c1c0d2424a96a3b8d059d2b561f79f1104e
tree: b01c04b523e6a36bd765224d36e3d11e646229fa
  1. Android.bp
  2. switcher4.py