Merge "Add intent flags back to TaskInfo's base intent" into rvc-dev am: 73654f1200 am: 62ea042147

Change-Id: Ib0f43ad14934f66ce4627f6c206518354398fc52