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