[automerger skipped] Merge "Fix deadlock in StagingManager.getSessions()...

[automerger skipped] Merge "Fix deadlock in StagingManager.getSessions() method" into rvc-dev am: c25a56ca am: 55662925 am: 77c6e916 -s ours

am skip reason: Change-Id I7a1abf44db27d4673d43e9b0886610a5bd8b41f6 with SHA-1 3aa1f5aa is in history

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

Change-Id: I708d43431de44d0cbafb48ca7a9933e2e6385fc5