Merge "Merge "Remove deleted strings from symbols.xml." into qt-dev am: 445d7b38e4 am: 12e821d5bf" into qt-r1-dev-plus-aosp
am: 9098a91d2b

Change-Id: I52d36c4d2e2f9dc8d9a54f3e9aadea3686d2bbe1