Merge "Fixed Handler Leak on RecyclerView" am: 62b028daca

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

Change-Id: I37b25039cb15a54f10c3e413a2917429f5f10694