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