Merge "Added a "lite" flag on ContentCaptureOptions."

diff --cc api/test-current.txt
Simple merge

diff --cc services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
index f3814c6,391b14b..d909736
--- 1/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
--- 2/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
+++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
@@@ -456,9 -442,12 +456,13 @@@ final class ContentCapturePerUserServic
      }
  
      @GuardedBy("mLock")
 +    @Nullable
      ContentCaptureOptions getOptionsForPackageLocked(@NonNull String packageName) {
          if (!mWhitelistHelper.isWhitelisted(packageName)) {
+             if (packageName.equals(getServicePackageName())) {
+                 if (mMaster.verbose) Slog.v(mTag, "getOptionsForPackage() lite for " + packageName);
+                 return new ContentCaptureOptions(mMaster.mDevCfgLoggingLevel);
+             }
              if (mMaster.verbose) {
                  Slog.v(mTag, "getOptionsForPackage(" + packageName + "): not whitelisted");
              }