Merge "DO NOT MERGE volume shows when status bar is null"
am: b5993cfb8e  -s ours

Change-Id: I6751be82e3055ab8510b283dec396f782918d9bc