Merge "Explicitly grant START_ACTIVITIES_FROM_BACKGROUND to com.android.phone." am: d6de97ba8b am: ce724cbe9e
am: 924018659d

Change-Id: I5ac8e33e54f4015fed6bbd5a3b354f2ae7447238