Merge "Merge "Add intent flags back to TaskInfo's base intent" into rvc-dev...
Merge "Merge "Add intent flags back to TaskInfo's base intent" into rvc-dev am: 73654f12 am: 66cbeaa6" into rvc-d1-dev-plus-aosp am: 4137aecb
Change-Id: I2123625e3d72cdb52c4d968956afdd5201e2164b