[automerger skipped] Merge "NetworkTypeController listen for device idle state...

[automerger skipped] Merge "NetworkTypeController listen for device idle state changed" am: be5546d6 am: e3184e1a -s ours am: 1c509724 -s ours

am skip reason: Merged-In I20cc39f2433b36033f37e46d2663c0b1395d798a with SHA-1 ca0c0f69 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2096256



Change-Id: Iad39ad3029b508db38f19aa8e4261a6a1506b539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>