[automerger skipped] Merge "Exclude Emergency Dialer from recent app list." am: 108b8d6e40 am: 6817b6031e
am: 751020501f -s ours
am skip reason: change_id I2fe917d16ab23de6e82f9cad7b064e2837ec6490 with SHA1 e4cc312408 is in history

Change-Id: I76fefb4a8f9c7387b39419097f461bfbd4e8d447