Merge "Fix DPMS.findAdmin() after app enumeration restrictions" into rvc-dev am: cf5670aa4e

Change-Id: I8ff24c19fa7ed686448b36cc0ce3bb1518608f0b