Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dev am: 7de6312dde
am: 5fde1b98fb

Change-Id: Ie88ec3204c1ae169507e6a9d22024188a229b3c1