Merge "Fix potential exception while pressing volume up and volume down" into...

Merge "Fix potential exception while pressing volume up and volume down" into sc-v2-dev am: b09275f1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16439834

Change-Id: I3fbe2a35e2edcd7f4abeee08a8653b3a5a7f02b3