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

Change-Id: I30d8f8e499e41f698d3212c9e2dbf6e07137ef80