Merge "Restrict StatusBarManager.collapsePanels() for targetSdk < S"