Merge "Prevent intent resolver from changing height when no app targets am: 4c0513d8c7 am: e338fa2d9d" into rvc-d1-dev-plus-aosp am: 8773bd558b

Change-Id: If1955a5cdb7f23bf29ad3646301b99ab52778369