Android o preview 2
Merge changes I83723db6,I71360551,I55c6ffd3

* changes:
  Switch BandwidthController per-UID commands to iptables-restore
  Simplify enums in BandwidthController.
  Add test coverage for BandwidthController app commands.