Merge "Bug fix so touching warning icon does not move the edit cursor. am: e2f29e0ad6 am: 4d5a3e045c am: 42605ce011 am: 59f1f29830 am: 14423e8104 am: c20aa88068" into nyc-mr2-dev-plus-aosp