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