Merge "Improve log messages when CE key is already protected by secret" into main am: a5be02dd48 am: 396563edc7

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

Change-Id: Id0dd087c997cd4ba7eb3c19c17300219892a2952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>