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

Change-Id: Icc63a9ee9e0a8752dde244f1f885141a1475c834