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

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

Change-Id: Ic5c46a86d1107b9219399161a2fc177508eee80b