Merge "Fix some comments in AndroidKeyStoreMaintenance.java" into main am: 7c77882399 am: 2e78341988

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2778008

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