Merge "Merge "Don't reinflate signal cluster after inflate" into oc-dev am:...
Merge "Merge "Don't reinflate signal cluster after inflate" into oc-dev am: 58ad9aac" into oc-dev-plus-aosp
am: dbb70d4e
Change-Id: I5f46389095d5bb5471394ca1dcc4adaa6c40e3f4