am b98fd933: Merge "Ensure that force lock works with accessibility enabled" into lmp-dev

* commit 'b98fd933fd7c5ca2c75849a013fc942ec211b5ee':
  Ensure that force lock works with accessibility enabled