[DO NOT MERGE] Don't drop restricted permissions on upgrade
am: 0b41c8940a

Change-Id: I717e5aedbc47b010cec5699bf864875aba76a4e7