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

Change-Id: I50008fd00da154ab03ec96570ea521f3340e9c59