Merge "Switch to metalava"
am: 806939b1b1

Change-Id: I3d9ea8c39dfcdaec12981a5ea3ca7fdd4d4e9118