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

Change-Id: If5dac8d65ef4903c3934d57ff8ba6912cd6ae38c