Merge "[automerger skipped] Merge "Add handle suppression to learned state" into qt-r1-dev-plus-aosp am: cac81a5c18 -s ours am skip reason: change_id I21e422382e62ee098cd6ff76d6b764db98be0cb7 with SHA1 0c68fbda26 is in history"