[automerger skipped] Merge "Allow system services to be optional" into main am: 55b0bcd8cb
am: 184aee6710
-s ours
am skip reason: Merged-In I761054caebe3e846f5c6c76e2818662aad2cb511 with SHA-1 5a594828d7
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3462915
Change-Id: Iac2445a670d7304bb58d1eba47b1d433ce6c9955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: