Revert "[Settings] Avoid rename inactive subscription from NullPointerException"

This reverts commit 1b71b5e6015f67b35c780bdb4cca8448f0084d59.

Bug: 148924129

Reason for revert: Broke tests

Change-Id: I27da954a105bb28f3f8c5f18961073a59c4d820f
2 files changed