Merge "Switch to metalava" am: 806939b1b1
am: 97466ef516

Change-Id: I39932539d0020241b9e6c63b01a07535fec21210