[automerger skipped] Transition keystore & vold to KM4.1 am: 415350082a am: 5c5eda5282 am: e64ea148e8 -s ours
am skip reason: Change-Id I1f59df5717eb831b029c5a37d834c3a8a3f56159 with SHA-1 acd7847ad8 is in history

Change-Id: I8a409b7b3705f3365d06281783f84f38bfec798e