Merge "Add metrics logging for Settings -> Help & Feedback" into nyc-mr1-dev am: d5f9642488
am: 6165a83ee8

Change-Id: I57e747977143413133a8bae88a22aad279e0d1dd