Merge "Merge "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 am: 603d14b9be  -s ours" into oreo-cts-dev am: 49a84b7096  -s ours" into oreo-mr1-cts-dev
am: 8c116e1984  -s ours

Change-Id: I1899810aa1a8f9028667b50f73f04f89bd51bb3b