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

Change-Id: Ibc4bcf689d31d0841f97eac67578705ccc59dc8f