Merge "Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev am: f508ece42d
am: 56c4f9f254" into qt-r1-dev-plus-aosp
am: cc87686e00
Change-Id: I7cbf454377ef9fc5b6bd3032bd229d113e577d7c
This commit is contained in: