tree 24799c5381e415e78694028583b7b2b5879efab7
parent b04872c35d89023664ab9460821a5fb9bce0c07d
parent eafda3c724e0465d8ae090c02247e5c0bb0480a8
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580813976 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580813976 +0000

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

Change-Id: I3e92055ad03cfa4f0bbe80185840f5783559c96f