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

Change-Id: I8823151ab194dab137c8f8632e59ad67210379fc