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

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

Change-Id: Idec4eb2c0afca69c0b322935397bea009f5683f1