Merge branch 'epic340-a15-a15_bringup' into 'a15'

        <activity

            android:name=".Settings$AccountDashboardActivity"

            android:label="@string/account_dashboard_title"

            android:label="@string/account_settings_title"

            android:exported="true"

            android:icon="@drawable/ic_homepage_accounts">

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

            </intent-filter>

        </activity>

        <provider

            android:name="com.android.settings.development.OTAProvider"

            android:authorities="custom.setting.Provider.OTA_SERVER"

            android:exported="true"

            android:multiprocess="true" />

        <!-- This is the longest AndroidManifest.xml ever. -->

    </application>

</manifest>