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

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

Change-Id: I36b12f89d64a290f5d78b2dc8468f1d20a9e0edd