[automerger skipped] Merge "Add test case for notifyDisplayInfoChanged on...

[automerger skipped] Merge "Add test case for notifyDisplayInfoChanged on wrong subId." am: 5be052d6 am: c10d6d69 -s ours am: ec26dab9 -s ours am: cb79c266 -s ours am: 43e151f0 -s ours

am skip reason: Change-Id Ib2e16f9510ccb19cd0d42da02c70781a4255d920 with SHA-1 14113826 is in history

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

Change-Id: Id90c5a991c89e5e1af3dc70870f24fb4ad02a916