Merge "CDD: Add recommendations for notification badges, and clarify how to use proprietary badging schemes" into oc-dev
am: a56afb0c68

Change-Id: I982630944b6de3848f4aab10faf1402d2a715e2e