Merge "Hide help and feedback in AOSP contacts" am: f28cb05f43 am: d993de4069
am: 6cacfcfa0d

Change-Id: I478cddac7170f62a3dfaca0fedfdcd583eeaf18e