Merge "Update onSubscriptonOverride listener" am: bff5a89842

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05f0d8e4e7b335fef2c9f92829f75c88b8d36dc1