[automerger skipped] RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI skipped: e26b5a4e89

Change-Id: I00a82229553be5a42a3a6b956ff58c9c36681b96