[automerger skipped] Rename NewTimeServiceHelper: it is no longer new am:...
[automerger skipped] Rename NewTimeServiceHelper: it is no longer new am: cf8993fa -s ours am: bf3655b0 -s ours am: 07c3986e -s ours
am skip reason: Change-Id I35854e853ded5be9ba129a970279e8ef122e2eb2 with SHA-1 46ed5cdc is in history
Change-Id: I3abdff1998bcdc25e7a8842aa8f19e04e3be3ac2