am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi...
am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev
automerge: 7b5f9cde
* commit '7b5f9cde':
Expose userActivityTimeout through @SystemApi getter/setter.