am 32f7a6d8: Merge "Move device admin max screen off timeout to internal...
am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev
automerge: c1275e72
* commit 'c1275e72':
Move device admin max screen off timeout to internal interface.