Merge "Hide help and feedback in AOSP contacts"