[automerger skipped] Merge "Explicitly grant START_ACTIVITIES_FROM_BACKGROUND to com.android.phone." am: d6de97ba8b am: ce724cbe9e am: 924018659d
am: 0a420e804e -s ours
am skip reason: change_id Id27fbac478d24d3445007a1437f56867f20acc0f with SHA1 da92fac429 is in history

Change-Id: Ia5124e5a9b73206fd19d60a944cc4c187ac2b147