Merge "Merge "Change string of switchbar and installed service category title" into qt-dev am: d0c5f2d443 am: bfed5d1ca1" into qt-r1-dev-plus-aosp
am: a06b899360
Change-Id: I2a43e94f2f8f91eb3efde4653f3ba692263f5394
This commit is contained in: