Merge "Do not allow to disable package "android"" into nyc-mr1-dev

author Ricky Wai <rickywai@google.com>

Mon, 18 Jul 2016 14:22:26 +0000 (14:22 +0000)

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

Mon, 18 Jul 2016 14:22:28 +0000 (14:22 +0000)
author Ricky Wai <rickywai@google.com>
Mon, 18 Jul 2016 14:22:26 +0000 (14:22 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 18 Jul 2016 14:22:28 +0000 (14:22 +0000)
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Ricky Wai <rickywai@google.com>
	Mon, 18 Jul 2016 14:22:26 +0000 (14:22 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 18 Jul 2016 14:22:28 +0000 (14:22 +0000)