Merge "[automerger skipped] Revert "Notify display brightness changed due to brightness transforms" am: 74bbae3074 -s ours"