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

Change-Id: Ie9d8419b88c3bb97eca24e6037c8e46ab8fc8489