Require publicAlternatives for APIs on max-sdk-q am: f90c406cfb am: 1ce8fb08f7
am: 99bc588ec5

Change-Id: Ibbb581f3fb270c476bd5da952abfb407480f3572