DO NOT MERGE - Merge ab/7272582

Bug: 190855093
Change-Id: I621120c6ac56e469af0dd2c4a0e4cb4b428f027f
tree: 973d53e8cf2c9718d9b112b7c7390932e69fc768
  1. Android.bp
  2. switcher4.py