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

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

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