Merge "Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev am: 5c9444216d am: 64432a513c" into nyc-mr1-dev-plus-aosp
am: 0c0fc1229b

* commit '0c0fc1229b390089869f651a91dd80fb910ba29a':

Change-Id: I887fe94a2c68962da5a4096636843e3446a9cd00