am 0c1c990a: (-s ours) am fbc84d90: Merge "Cherry-pick "Add --disable-compositor-touch-hit-testing flag"" into klp-dev

* commit '0c1c990abf97a7707b8548d6f39e2b51daafdcc6':