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

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

Change-Id: I2fc9647e57bb7b0ed07d5afba0ad7395efbdc5f5