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

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

Change-Id: Ie28a16bfb9743abb26c14366afb11813d816b8b5