Merge "Avoid triggering device admin settings in non-current user." into nyc-dev am: a433fd2429
am: 377623b6ee
* commit '377623b6eea4fab4492a8593a7bc66d5598f0260':
Change-Id: If3a40be94c7e73aad9197b6ab47ea38c683fd5b2
This commit is contained in: