Merge "[IT4.3] Listen interface change in BSS" am: c95ab361c7 am: 97b07f5b2e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531807

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib51a30f6c2b7836df82e250c82194d73cb8caa80