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

[automerger skipped] Merge "Fix deadlock in StagingManager.getSessions() method" into rvc-dev am: c25a56ca am: 2ebf7b36 am: 10dc5a37 am: bed15005 -s ours

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

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

Change-Id: I1db4b8788b67af2ef6c226f3b3deef2f48c66c36