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

Change-Id: I0a32e4481ffd026c8a338b1500f70109983b21a5