Merge "USB debug dialog won't give permission if obscured." into oc-mr1-dev am: 30d876498c
am: 9182988393

Change-Id: Ie0cf64d80405a7ce9cd6831d8bb7c7ade5215d35