[automerger skipped] Add condition to check case of accessory combinations am: b767df1a08 am: 416110bac0 -s ours
am skip reason: Change-Id I7c80f02de5340799e292949608e19b86b187b982 with SHA-1 7d71081d45 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218259
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I033d1b9b5eb516dd781304b2627da1ebe8a8728a
This commit is contained in: