Merge "Removing depreciated fn isLockToAppEnabled in ActivityManagerWrapper"