Merge "Explicitly grant START_ACTIVITIES_FROM_BACKGROUND to com.android.phone." am: 8c4ced5b43 am: c002e222ea
am: 65f6a63e5d

Change-Id: I86ddd06887f4b04a7c93153b290182e49967fb02