Merge "Apply the final modifier to KeyStoreManager" into main am: 4942247e71

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

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