Merge "Annotating a class with @SystemApi makes its members @SystemApi"
am: 9c8b644b83

Change-Id: I38f58a3d0694a26728c81b7e03e5877ecb6d3a22