Merge "Add config to use a display rule that ServiceState was considered" am: bbaa19ca am: cd899294 am: c9433550 Change-Id: I51f2c8c7bf6f2fa5d62417459964a85e36bd4302