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

Change-Id: I51f2c8c7bf6f2fa5d62417459964a85e36bd4302