tree 87e2cf13c88a70e5f5d78c8762e94064cd99a484
parent ea329ffa8c3b00456d5642325c29be8e43a3fc45
parent bd48542c46bdbda4d3a6cfd186be8ce9e6476f3a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1698169645 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1698169645 +0000

Merge "[automerger skipped] Merge "m framework-minus-apex should not build services" into main am: 13c1831ff6 am: bed2522ab5 -s ours" into udc-qpr-dev-plus-aosp am: bd48542c46 -s ours

am skip reason: Merged-In I1eb64da7318d1bad003e71962ca8a90b7229ea49 with SHA-1 338107bd1f is already in history

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

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