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

Change-Id: If9de8bace8f8059fcffb986c87413ccefdadc5cb