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

Merge "Correctly find last visible usage in chain" into sc-dev am: 0c9176bc am: 40926798 am: c5dafdb7

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

Change-Id: Ia63d10a6539ca32344750251b36eb03080ed7342