Merge "Fix potential exception while pressing volume up and volume down" am: c4a8259f78

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

Change-Id: I755c7b3494402f59f133112ddffd957d3f8fad3e