Fix idmap enforce overlayable bug

Idmap2 is not enforcing overlayable on Q overlays and instead on P
overlays. This corrects this behavior.

Test: idmap2_tests
Bug: 128932015
Change-Id: I7e45a965d3b165dae7ed7377d0911afd62f63983