Merge "Use filter_packages to unbunden metalava" am: 385291c36d
am: 14698c6e71

Change-Id: I000c42b8e9633e7f0df8e633c90c9c0315260f61