Merge "Merge "AOD: Make sure to update visibilities after instant expanding"...
Merge "Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev am: 4bb2f8e9 am: 5106255d" into oc-mr1-dev-plus-aosp
am: 874fb1bc
Change-Id: I8f3b85f1f5dfb10146c4e2c2ee75a750f2cdd81c