Gate access to targetsdk-max-p,q on compat framework am: 2dea07964e

Change-Id: Iad8e004389c1324f86a8f50e2ff3e72f9eccebae