[automerger skipped] Merge "Re-enable NetworkTimeUpdateService for Wear" into...

[automerger skipped] Merge "Re-enable NetworkTimeUpdateService for Wear" into android15-tests-dev am: f52c4570 -s ours am: 62ed4a07 -s ours

am skip reason: Merged-In Icfb71eb0431a5fa6db9eeed5dfbf17a4d0208226 with SHA-1 ad74fd7c is already in history

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



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