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

Change-Id: Icd335171fdc34752069ee74754572a17df4ee9a0