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

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

Change-Id: I484c140a0d7294f0ef4b797f5c41cc1ee542fc87