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

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



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