Merge "Allowing AppWidgetService to start without FEATURE_APP_WIDGETS" into nyc-dev

diff --cc core/res/res/values/config.xml
Simple merge

diff --cc core/res/res/values/symbols.xml
index 6526571,b89709d..694e934
--- 1/core/res/res/values/symbols.xml
--- 2/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@@ -307,7 -307,10 +307,8 @@@
    <java-symbol type="bool" name="config_supportsMultiWindow" />
    <java-symbol type="bool" name="config_guestUserEphemeral" />
    <java-symbol type="bool" name="config_localDisplaysMirrorContent" />
+   <java-symbol type="bool" name="config_enableAppWidgetService" />
    <java-symbol type="string" name="config_defaultPictureInPictureBounds" />
 -  <java-symbol type="string" name="config_centeredPictureInPictureBounds" />
 -  <java-symbol type="string" name="config_pictureInPictureBoundsInRecents" />
    <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_threshold" />
    <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_factor" />
    <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_penalty_threshold" />

diff --cc services/java/com/android/server/SystemServer.java
Simple merge