Fix deadlock between activity manager and settings provider

Test: manual
Bug 36028906

Change-Id: I20344608d79d174b468506056789c04d3bde510f
(cherry picked from commit 73360ab2d12645a177e8e3d860dec3407839ad76)
2 files changed