Merge "Enabled annotations for Metalava based api-stubs." am: 79d3bf6e54 am: 0da95a5d64
am: 7c96332354

Change-Id: Iea928b33e984049904ca0fdba4923ee06cfd5971