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

Change-Id: Ic769244f5fb8cefa9ee098dc054d0c2733b950ab