Merge "Avoid showing DeviceAdminAdd screen in the background of support dialog." into nyc-dev
am: 41dde76a
* commit '41dde76a':
Avoid showing DeviceAdminAdd screen in the background of support dialog.
Change-Id: I0bcae090f9e91b4e67356a42fb64213c7370d3be