Snap for 8564071 from a17cc37541597fbb02676bbda5afcc2b1077cbf7 to mainline-documentsui-release

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