Merge "Improve getModemActivityInfo API" am: aa8c59bea2 am: b60680edf3

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1895248

Change-Id: I6fbc96503333f87cfdcaf8d1021403a7c2f8dc56