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

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

Change-Id: Ia05b2d2068539b0dfb3496d015f320ed4ae8f622