Merge "Hide app info button from app notification settings header" into oc-dr1-dev am: 9b4bb95e82
am: 49347cfb22

Change-Id: Idec10ca420e5b7ae3f1a23cc24af67a110209483