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

Change-Id: Ie3385442c0bf28a1da52cb2d687ed45921604f80