Merge "[Settings] Avoid rename inactive subscription from NullPointerException" am: 91638e079f

Change-Id: I9a488c3d7b6452b64d1cb8b532d0f66f25017773