Merge "Revert "Revert "Remove deprecated System APIs added in Q.""" into qt-dev
am: 3bd719b534

Change-Id: I3a55fc232cef2d22052d3b1faf2ef08047e2f7c2