Merge mpr-2021-11-05

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