Merge "Hides non-system overlays on USB debugging dialog." into oc-mr1-dev am: f7964b1513
am: 32ab50bb99

Change-Id: I0f0dde5f886c1b9959782c4e48a6fda2e1030e76