Merge "Remove pending callback from AttentionManager" into qt-dev
am: 29966ca5de

Change-Id: Ie7361fb201d40dac5a89e93f61c3ead2b53fe2ae