Merge "Add filegroup for UnsupportedAppUsage and its deps" am: 363e58d167
am: 4ad2672959

Change-Id: Ia05dbcff65418d279a0f234b8f77296a7ce0ea9a