Merge "Merge "Keep lock while binding the storage service" into rvc-dev am:...

Merge "Merge "Keep lock while binding the storage service" into rvc-dev am: cdde51ea am: 8ddeead6 am: 6b4a4aa4" into rvc-qpr-dev-plus-aosp am: 4a90d53a

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

Change-Id: If5e4b263489dab33645367d2ce95757ea2c44ac0