Merge "[DO NOT MERGE] Don't drop restricted permissions on upgrade am: 0b41c8940a am: 29adaea681" into qt-r1-dev-plus-aosp