Merge "Remove @SystemApi annotation for an overriding method" am: 5c7bd75060
am: 232c2e84da

Change-Id: I9976fc35ee7f21aea3563d84cb2d871d03471517