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 am: 2e4a1bb9

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



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