Change the Listener API names

Test: cts
Bug: 135204580
Change-Id: I1f64d6eb6b113ca85f43a3f6a578c68dbb8bd5ed
4 files changed