Revert "Remove more calls to addFullExpansionListener"

Revert submission 24891808-addFullExpansionListener

Reason for revert: Potential culprit for b/305275185 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:24891808-addFullExpansionListener

Change-Id: I08641d935be797f91939376fea794b604e1626bc
16 files changed