Merge "Add config to use a display rule that ServiceState was considered"
am: bbaa19cad3

Change-Id: I7adbdcdcefaf86e9cf6775aa23aac2618149cf92