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

Change-Id: I28239c5cd46d5772bddc3f2f2e76f10e5a7cc171