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

Change-Id: Ib3f80a096d333e7bd3dbdfb57a91be41d4aa823b