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

Change-Id: I4f7cc636c3c1cf84de3963947730ac56147131aa