[automerger skipped] Merge "Reload the Ambient Light Sensor on Display Change" into tm-qpr-dev am: a9a57f0550 am: d270036a8c -s ours

am skip reason: Merged-In I8b2d76d916d79f7dae22d81adc3ce69780bf9bfc with SHA-1 eec9ec7cba is already in history

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

Change-Id: Ic60b34fb4552b7f0584036f6b2fcbe69ae961977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>