[automerger skipped] Merge "Add new method to update Layer2 information when...

[automerger skipped] Merge "Add new method to update Layer2 information when L2 roaming happens." into rvc-dev am: 5b9db263 am: 62267159 am: 64f30a0f am: fcd5247e -s ours am: d31fb8a8 -s ours

am skip reason: Change-Id I171bd5e22b5afd5c62029392af627d7bdfe32161 with SHA-1 1083b27f is in history

Change-Id: I5665296df0a7d3bd8ea27f33e269a831fa9ef7e1