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

Change-Id: I33ab4cdd6ec9ab4e6a0babdae0c466e374771624