Merge "Merge "Fixed that clicking on the remoteinput didn't work from AOD"...
Merge "Merge "Fixed that clicking on the remoteinput didn't work from AOD" into qt-dev am: 70c8685a" into qt-dev-plus-aosp
am: 388a7e0d
Change-Id: Ib5e013cb7da9a007a28499e9a0b34d465a1037fb