Merge "[automerger skipped] Merge "DO NOT MERGE: when checking oem declaredPermissionsMap, skip if the permission is HIDE_NON_SYSTEM_OVERLAY_WINDOWS_PERMISSION bug: 80325168" into nougat-cts-dev am: 6e001ecde6  -s ours" into nougat-mr1-cts-dev