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

Change-Id: I6cbe117e63c2c41b27612b3d78fe17e0c11b6de1