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