Merge "Don't retry starting the artd_pre_reboot service." into main am: 35c88d14 am: 98e3eb4b

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



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