Merge "Fix deadlock in StagingManager.getSessions() method" into rvc-dev am: c25a56caed

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

Change-Id: I5b59c7c270b5d5524f031bc6dfd08c670d280a86