[automerger skipped] Merge "Expose requestModemActivityInfo" am: e34b1b87 -s...

[automerger skipped] Merge "Expose requestModemActivityInfo" am: e34b1b87 -s ours am: c5f0ec65 -s ours am: a572fdeb -s ours am: 770a7aea -s ours am: af33a5fb -s ours

am skip reason: Merged-In I7e8134c8058017b888c324a9f85d473fc3cdd8f5 with SHA-1 5311ad3f is already in history

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

Change-Id: Ida83ddf63fc76ac65026c8c4a5969a47460b9b84