am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi...
am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev
* commit '13c70441':
Revert "Expose userActivityTimeout through @SystemApi getter/setter."