Merge "DO NOT MERGE: Added test_required_features for AppWidgetServiceImpl Test am: 939f04975d  -s ours" into marshmallow-cts-dev
am: 93a836ae83  -s ours

Change-Id: Ifa5042aa7af8b0de2b6250534e5de4b7e0bbfe4c