Merge "Replace isAdb and enforceShell in DPMS"