Merge "[MS42.1] Replace PhoneStateListener with DisplayInfoListener" am: 39cdfe6a57 am: f58f298ba7

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

Change-Id: I54605525bd5b305fb1872823f9e0802cb2ee1681