Merge "Update automotive display service rules"