[automerger skipped] CallStyle: don't reglue icon+label if never glued am: 8633a0d8 -s ours

am skip reason: Merged-In I2160dd17d39bd00a045422e2096d14b9ebb68902 with SHA-1 7f5aea44 is already in history

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



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