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

Change-Id: I31770f7e9c9a84bd37dcfaacef3f0ca840876918