am bd80b4d8: Merge "Fix failing accessibility CTS tests." into klp-modular-dev

* commit 'bd80b4d8de2642bfc38ea244bfea5a664f02d754':
  Fix failing accessibility CTS tests.