automerge: a20e430
* commit 'a20e430d0ab8c65e392491b6d299a821c4bed50e':
Revert "Expose userActivityTimeout through @SystemApi getter/setter."
automerge: a20e430
* commit 'a20e430d0ab8c65e392491b6d299a821c4bed50e':
Revert "Expose userActivityTimeout through @SystemApi getter/setter."