Merge "Change variable name fix from 'endingListener' to 'endListener'" am: af1750e973 am: d54498fb88

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

Change-Id: Id09f9faa6cb0615f5adfc4512079ff7e3c2d3768