Merge "Revert "Add setting for device docked screen timeout."" into tm-dev am:...

Merge "Revert "Add setting for device docked screen timeout."" into tm-dev am: dec54533 am: ff3f8459

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17472665



Change-Id: Ica097f6053c274d3b528576e01de43c5ae1210d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>