Merge "Remove @hide from top-level StatusBarManager"