Merge "Merge "Fix returning an occluded activity below boundary" into rvc-dev am: 9cbcb69d59 am: 3b8cb03121 am: fcb62ad445" into rvc-qpr-dev-plus-aosp