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

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

Change-Id: I45f11f64c84b540a27cdc39af493a2ee4e552bce