Mark ab/7061308 as merged in stage.

Bug: 180401296
Merged-In: I35781ad4005ec0cfb2cf9523fe6b5a2e4f934456
Change-Id: I127688e1eae5cbe653c558323a5274762bd67e96
tree: 973d53e8cf2c9718d9b112b7c7390932e69fc768
  1. Android.bp
  2. switcher4.py