Merge "Support excluding overlays when enforcing RRO" into oc-mr1-dev
am: aa7f44d4d4  -s ours

Change-Id: Ibfe2acc84b8f2985fd1ed2e73b0475ff610b93cf