Merge "Don't hold hibernation lock when calling other services" into sc-v2-dev am: 17108cde

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

Change-Id: I5442d98e6299d050c84c2d38dd522c6d6dcd2b6d