[automerger skipped] Merge "Update onSubscriptonOverride listener" into...

[automerger skipped] Merge "Update onSubscriptonOverride listener" into rvc-qpr-dev-plus-aosp am: 3af9f883 -s ours am: d9e06e2c -s ours

am skip reason: Change-Id I9436b414608d7c964185d3d5c3f1f554c65b2c12 with SHA-1 613c77f3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e1620aac1c5401d9aa0f3bf79e5c3db01bc6e29