Merge "Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c11 am: 440137be48" into oc-dr1-dev-plus-aosp
am: b1ae22139a
Change-Id: I2665bccc9b118938f2cb1ba9ae36b2f4909c3d06
This commit is contained in: