Merge branch 'settings-improvement-oreo' into 'v1-oreo'

        </activity>

        <!-- /e/ specific changes -->

        <activity android:name="Settings$MicroGActivity"

       <!-- <activity android:name="Settings$MicroGActivity"

            android:label="@string/micro_g"

            android:icon="@drawable/ic_homepage_microg">

            <intent-filter android:priority="1">

                android:value="com.android.settings.category.ia.homepage" />

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

                android:value="com.android.settings.MicroGSettings" />

        </activity>

        </activity>-->

        <activity android:name="Settings$OpenKeychainActivity"

            android:label="@string/open_keychain"

<?xml version="1.0" encoding="utf-8"?>

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="32dp"

    android:height="32dp"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="32"

    android:viewportHeight="32">