Merge "Merge "A11y Scroll Forward/Up Now Unlock or Show Bouncer" into rvc-dev...
Merge "Merge "A11y Scroll Forward/Up Now Unlock or Show Bouncer" into rvc-dev am: b5e09573 am: e9ff69ae" into rvc-d1-dev-plus-aosp am: 9545cfbe
Change-Id: Ifd3e3970b13102f231ecf460273279fff45eed62