Merge "[MS42.1] Replace PhoneStateListener with DisplayInfoListener" am: e649046811 am: 900eb0a86a am: 1d7abccd25

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

Change-Id: I2fc9647e57bb7b0ed07d5afba0ad7395efbdc5f5
tree: 1d2fbcdf7174a4a9429057eef0e4a15abe2847a5
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/