Merge "Support excluding overlays when enforcing RRO" am: 28e1862411 am: 97361fd9c3
am: 010d18d04b

Change-Id: I494c92717c23a456d1a149d3b7e076a5a64dc168