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

Change-Id: I0d60f409c4d2c2d5e86a9789a66d7c25e864ccf4