Filter DataItems with suitable way.

We should carefully modify unordered_set when traversing it.
Update the iterator with the return value of erase function.

(cherry picked from commit 7e67a69c3afb01995be46ed45d3f328f0154f81c)
Bug: 117118677
CRs-Fixed: 2288358
Change-Id: Icd4664bf479f1d37b61dae0f9d793777d88a00d0
(cherry picked from commit da6fcfd8a16404705ab0a3d4ddfb1f4282c2dac0)
1 file changed