Merge "Update permissions UI to match new watch UI." into cw-f-dev
am: c087334878

Change-Id: I6e5bab5f4a237a1e12ed9630864e5a12230b4dec