Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev
am: 9234a34a80

Change-Id: I25a0968edf534242130fdfda405bb6dfb8afc24a