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