Merge sc-mainline-prod

Bug: 189946434
Change-Id: I273ddfbb03f8398fc3c7d23b3748aca27c9ae3a4
tree: 973d53e8cf2c9718d9b112b7c7390932e69fc768
  1. Android.bp
  2. switcher4.py