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