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