[automerger skipped] Merge "Make actions editable" into 24D1-dev am: 089280f5 -s ours

am skip reason: Merged-In I5a5729cc1e4bb021efb441e367fdac0ee72bc723 with SHA-1 79de0412 is already in history

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



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