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

Change-Id: I87eb5369d0adff1684f2e8ded3e362774f4beac4