Merge "Fix fingerprint suggestion icon color." into pi-dev

                android:resource="@string/suggested_fingerprint_lock_settings_title" />

            <meta-data android:name="com.android.settings.summary"

                android:resource="@string/suggested_fingerprint_lock_settings_summary" />

            <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />

        </activity>

        <activity android:name=".password.ChooseLockGeneric$InternalActivity"