Merge "Add ro.surface_flinger.set_display_power_timer_ms to sepolicy" into qt-r1-dev