Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab
am: 8a5272b307
Change-Id: Ia9815d0de9d01c3a362b9d1af75d620887cc240a
This commit is contained in: