Merge "Merge "Remove attention controller" into qt-r1-dev am: 41aafab963 am: 645480a4e4" into qt-qpr1-dev-plus-aosp
am: 451965fab8

Change-Id: I5cab13c7589dd89547cbd1ef141faf466b2a590b