Merge RP1A.191031.003

Change-Id: I98024152a289c582c9aff6bbae0f203d147c01d1
tree: 42aaff17f746a1267e8ba54efbaf640f26317613
  1. Android.bp
  2. switcher4.py