Merge "Fix DPMS.findAdmin() after app enumeration restrictions" into rvc-dev am: cf5670aa am: d784875f Change-Id: Ic7fe3f0e263f66d0fb6d6ebf6edfae304e7e336c