[automerger skipped] Merge "[Settings] Avoid rename inactive subscription from NullPointerException" am: 91638e079f am: eafda3c724 am: b0ebb47014 -s ours
am skip reason: Change-Id Ifc245bec739b4c81d2cee04b091bcdb54d567d4a with SHA-1 1b71b5e601 is in history

Change-Id: I2eae2a31035e0d337f0f0b0554cead9cadaa16b1