[automerger skipped] Merge spl-2021-03-05 skipped: ba461c6722

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