Merge "Merge "Create a general mapping between window types and inset types." into rvc-dev am: e88d949e0a am: d7f1e2e0c5 am: eaa9580d88" into rvc-qpr-dev-plus-aosp am: 0a5afc0670

Change-Id: I03227c4be7688a7d6503e03390a3915c30ca447f