Streamline accessibility flow

Bug: 111548033

Test: Builds
Change-Id: I5df5ca230732c8ab4ff105b93ee16865b3f4d999
2 files changed