Merge s-mpr-2021-12-05

Change-Id: I5b02d6ef9d527924ea28a5384af849d5a58eecd8
tree: b01c04b523e6a36bd765224d36e3d11e646229fa
  1. Android.bp
  2. switcher4.py