Merge "StorageManagerService: fix names of user lifecycle methods" into main am: 07615e3062 am: 843bb55775

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

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