[automerger skipped] Simplifications for shelf_action_chip am: bb8f1da6a0 -s ours

am skip reason: Merged-In Id1b0d9656b79180bf5489a848721ab4caa289c68 with SHA-1 838626ec60 is already in history

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

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