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

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

Change-Id: Ib4069ff9007cdb67387b7e81e8dd51f609ca1a59