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 am: 1320475d
Change-Id: I0600035a62a000a1a26dc558a475414c5cb25a90