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

Change-Id: Idcc1878a6ba42f40e558cd591bda3967860d1688