resolve merge conflicts of a8af2d3664 to pi-dev-plus-aosp

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie95fe77f761197dee450e86bc0f7edba8d514959
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571

src/com/android/settings/development/featureflags/FeatureFlagPreference.java

@@ -17,6 +17,8 @@
 package com.android.settings.development.featureflags;
 
 import android.content.Context;
+import android.util.Log;
+
 import androidx.preference.SwitchPreference;
 import android.util.FeatureFlagUtils;
 import android.util.Log;