Merge "CDD: Require App Shortcuts when pinned shortcuts are supported" into oc-mr1-dev am: 3f2dc2721d
am: f9b56b94c0

Change-Id: I39be89ddc1b28ac14a6c07d1f4e710fe98e69b74