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

Change-Id: I5b5ea99a325b67b47bc9f502cde792d079bc8adf