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

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

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