Merge s-mpr-2022-01-05

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