[automerger skipped] Merge "Explicitly grant START_ACTIVITIES_FROM_BACKGROUND to com.android.phone." am: 8c4ced5b43 am: c002e222ea am: 65f6a63e5d
am: 80c2fa8580 -s ours
am skip reason: change_id I85669423e628b4534a3f28efd17947ca2481454e with SHA1 953484ea44 is in history

Change-Id: Id3b43efb715a92886e83ae539300e36602c75987