Merge "Correctly find last visible usage in chain" into sc-dev am: 0c9176bc am: 9966bf17 am: d5e43103

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

Change-Id: Ie0230c710a580db08aa7028dae9631e492ba926f