Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab
am: b72aa1c03a
am: 9afe77d369
am: 278e5686b2
am: 0f91d1604c
Change-Id: I6e0b84e3d87a124edfe8bc20c597afa5e40f381b
This commit is contained in: