Merge "KeyUtil: don't use keepOld=true for system DE and volume keys" am: 4a969dba60 am: 1d692f3b7b am: 83ff4db88a

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1480696

Change-Id: I23bd8f557ddd143a9e1efa1d9e79a8181f9a5901