Merge TP1A.220107.002

Change-Id: I7bdc10d77368141c32bcd65f765ebf15cdc2112e
tree: f0cee68420551e1e2e9d21d7af7eab3ae9490e52
  1. Android.bp
  2. switcher4.py