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

Change-Id: I01b6fd2391e1296546291af5db5a4663e67fae01