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

Change-Id: I16cf6329419acc83c655ea40c2fe0359349cc42f