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

Change-Id: Ic1f1448e5111db2afb1b7584a4de08cde4d5c001