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

Change-Id: I0687aadcd58f205669b9747666d5d64693a51ae1