Merge "Fix potential exception while pressing volume up and volume down" am: c4a8259f am: 2fc6632e am: 6a73a228 am: 2f82755b

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

Change-Id: I3b0441f2ee9a6d00d37aa220f07db2ebbbda59d3