Merge "Merge "Update handle behavior defaults to updated POR" into qt-dev am: 8c15e2c8 am: 412bc083" into qt-r1-dev-plus-aosp