[automerger skipped] Merge "Add explicit dep on ims-common" am: 0f6b2ec2 am:...

[automerger skipped] Merge "Add explicit dep on ims-common" am: 0f6b2ec2 am: 7fe08c19 -s ours am: afc6e0ac -s ours

am skip reason: Change-Id Ic663e206a0e2e780be2f27b5d539c274d4eef245 with SHA-1 d3c9df3e is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1370159

Change-Id: I3aaca7efeeb861bdb711f86eda21643b800dedf3