Merge "Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev am: 689359914d  -s ours am: e8fe97e09d" into oc-mr1-dev-plus-aosp