[automerger skipped] Merge "Disable emergency dialer shortcuts feature" into pi-dev
am: e21b357889  -s ours

Change-Id: Iba9083c3704535fc357df7b2d621fdf41be3c8b6