am fd04632a: am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev

* commit 'fd04632ab5fe9272b0f1d2ff94367a574e026a5b':
  Hide getDeviceGlobalActionKeyTimeout