Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dr1-dev am: e54ad58aea
am: 73035910fc

Change-Id: I43e867115e6242ef5a19795c8e53cccb5097d633