Merge "[MS42.1] Replace PhoneStateListener with DisplayInfoListener" am: 5366b82996

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

Change-Id: I8e3276bddc9a6e11d33e5b662e1ddf2d8a68f54b