Merge "Properly test TrafficController permissions on package updates."
am: 038d906ac8

Change-Id: Ia6d480739fadaa7b3277d9b6e9abc303b8e551b4