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

Change-Id: I7ab7bff54d954dcce849a007289d5289363251ab