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: I371d9e07b9125a5d0d9af1f7892bbafaf8d5599d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>