Snap for 7080740 from a624f90c0076c3814c7e6602cde80493c5d90273 to mainline-permission-release

Change-Id: Iec2342085a278a6265e7d10760a50ff7f44ff384
tree: f95263c33a855c69a499c737fe82a0ab9970ddd7
  1. Android.bp
  2. switcher4.py