Merge "Add a feature flag for CTS." into oc-dev

author Sam Lin <samlin@google.com>

Wed, 5 Apr 2017 01:29:15 +0000 (01:29 +0000)

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

Wed, 5 Apr 2017 01:29:20 +0000 (01:29 +0000)
author Sam Lin <samlin@google.com>
Wed, 5 Apr 2017 01:29:15 +0000 (01:29 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 5 Apr 2017 01:29:20 +0000 (01:29 +0000)
diff --cc core/java/android/content/pm/PackageManager.java
Simple merge
author	Sam Lin <samlin@google.com>
	Wed, 5 Apr 2017 01:29:15 +0000 (01:29 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 5 Apr 2017 01:29:20 +0000 (01:29 +0000)