Merge "Fixed Handler Leak on RecyclerView" am: 62b028daca am: 78ac7dd921 am: a475e3f791 am: acbc01ea84

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

Change-Id: I12ef4a07b4430c7eaa50d9fe3183d925cb26aeee