Merge "Avoid calling into phone process with NPMS locks held." into sc-dev am: d5bda8a0d5 am: 2f383c36ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15060769 Change-Id: Ic43f3d6d11dea08a6985da8f3f5954edd477dfa7
This commit is contained in: