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

Change-Id: I9679940b81666b5e7a4ecce4af776cc0270a9164