Merge "Change variable name fix from 'endingListener' to 'endListener'" am: af1750e973 am: d54498fb88 am: e6d76eb39d am: 277df8d8ff am: 39ed7a1b42

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

Change-Id: I7de6984109fb7d129414c6188fe9eaeb00a7a799