Merge "Make GetActiveDsu() static inline" am: 53ad534d6f am: bb1950da87 am: cb2cd41942 am: 542566bb81

Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452415

Change-Id: Ie1357cec82974414708ff9982ece4b12924ad928