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

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

Change-Id: I53261f022e658d3aed1d666804619611346c97a6