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

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

Change-Id: If0ac3d85f7de6619267eaad5237b0d4582e50e77