Merge "Don't crash in background after app uninstall." into oc-dev

author Daniel Nishi <dhnishi@google.com>

Fri, 14 Apr 2017 00:56:14 +0000 (00:56 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 14 Apr 2017 00:56:19 +0000 (00:56 +0000)
author Daniel Nishi <dhnishi@google.com>
Fri, 14 Apr 2017 00:56:14 +0000 (00:56 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 14 Apr 2017 00:56:19 +0000 (00:56 +0000)
diff --cc packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
Simple merge
author	Daniel Nishi <dhnishi@google.com>
	Fri, 14 Apr 2017 00:56:14 +0000 (00:56 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 14 Apr 2017 00:56:19 +0000 (00:56 +0000)