Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe
am: 976cf076de
am: 9327cd5f4f
am: c9827dd27e
Change-Id: Ibd2bfb69c823623dfd3ad44eccde6d7c62d0913c
This commit is contained in: