Merge "Annotating a class with @SystemApi makes its members @SystemApi" am: 9c8b644b83 am: 6813b8a90b am: 6c1921ece5

Change-Id: I85329e6252dfa71d247f10d26d9a8e07cddf9c2b