[automerger] Merge "Abbreviate permission labels less aggressively" into pi-dev am: af76df93e3 am: 3dce361445

Change-Id: Iea45f6992477e090e0f7ecaf2c4689354ad24786