Merge "Merge "Mark EdgeEffectTests#testOnAbsorb() as @LargeTest" into oc-dev am: fc29bbd78c am: 7e1ad2c26b" into oc-dr1-dev-plus-aosp