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