Merge "Merge "Adds new activity flags to the @Flags annotation." into rvc-dev...
Merge "Merge "Adds new activity flags to the @Flags annotation." into rvc-dev am: 24070a6c am: ba705b54" into rvc-d1-dev-plus-aosp am: 42b0a866
Change-Id: Id3a904473ce682fd7b1d8cf70be727781c3fa0b5