Merge "Revert "RESTRICT AUTOMERGE Remove deprecated System APIs added in Q."" into qt-dev
am: 8b3b7771c1

Change-Id: Id0a6dbf04d575a644017c69c15a85189d6e13ff2