Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776



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