Merge mpr-2021-09-05

Change-Id: Idbf7709aaef8c2a8f5d4e4c75c6d00197dac9c10
tree: f95263c33a855c69a499c737fe82a0ab9970ddd7
  1. Android.bp
  2. switcher4.py