[automerger skipped] Merge "[NetworkPreferencesApp] Step 8: BOOT_COMPLETE svc"...

[automerger skipped] Merge "[NetworkPreferencesApp] Step 8: BOOT_COMPLETE svc" into sc-dev am: bf8a91d2 -s ours

am skip reason: Change-Id I1e29ca3b03e90086cbde4e266fff7e0e473de749 with SHA-1 90fc79f3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie938c6eb694fe02df12ac8f63a3c6d17b938082a