Merge "Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am: 081e393103" into nyc-mr1-dev