[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: 7d3fbd8b am: 21db0d49 am: 55ed472e am: 12dfdd9c -s ours am: bcd10ae7 -s ours

am skip reason: Change-Id I85eabccb6f5d5f322c8e3df556ceef6647616f5a with SHA-1 3168e392 is in history

Change-Id: I74185edba56d3770f505b464a9ba3fa4c045f9b3