Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634aa5
am: 43ea982e9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776 Change-Id: I4084549e11093ef5959b9f3748ab16b8ccc36e2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: