Require publicAlternatives for APIs on max-sdk-q
am: f90c406cfb

Change-Id: Ibcec69c2a5f6677720010b7de055d278f30ec179