Merge "Change associate return type to void" into sc-dev am: fc191ab4c2

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

Change-Id: I3fbec9b94c98aff7dcb8c7d171343289c949035a