Merge "Annotating a class with @SystemApi makes its members @SystemApi" am: 9c8b644b am: 6813b8a9 Change-Id: Id7743c7f66d10f9eeebeb16772edcd9fe80bcc5c