Merge "Prevent deadlock in AttentionManagerService" into qt-dev am: bcfa3c158e
am: e19629a039

Change-Id: I38a0f74c7f9932995d896ae4bc6d663cd207d565