[automerger skipped] Merge "Update onSubscriptonOverride listener" am:...

[automerger skipped] Merge "Update onSubscriptonOverride listener" am: bff5a898 am: d25b9c12 -s ours am: ad0fcc19 -s ours

am skip reason: Change-Id I9436b414608d7c964185d3d5c3f1f554c65b2c12 with SHA-1 57fbecc6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0e97f49cbbbbdd1427e67275995369da84b6bc7