[automerger skipped] Merge mpr-2021-09-05 skipped: 9cde36af15 am: fdd38e494e

Change-Id: I088904817bcdb1d46bf15e47adffe19b14423f91
tree: 973d53e8cf2c9718d9b112b7c7390932e69fc768
  1. Android.bp
  2. switcher4.py