[automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: 35294a1532 -s ours am: 30a21c11a3 -s ours
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history
Change-Id: I515a7dab7f2b7ed6f4c3223dc0f08c03bcbe005c
This commit is contained in: