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

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