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