Merge "Filter package related info" into oc-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Thu, 18 May 2017 19:34:58 +0000 (19:34 +0000)

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

Thu, 18 May 2017 19:35:03 +0000 (19:35 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 18 May 2017 19:34:58 +0000 (19:34 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 18 May 2017 19:35:03 +0000 (19:35 +0000)
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 18 May 2017 19:34:58 +0000 (19:34 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 18 May 2017 19:35:03 +0000 (19:35 +0000)