Merge "Update lint baseline for services" into main am: 8e3ebe5899 am: 78a9894cc5

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

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