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