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

Change-Id: I013ae707efd89eb7d29fd077dc5593a474657e74