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