Merge "RESTRICT AUTOMERGE Remove deprecated System APIs added in Q." into qt-dev
am: 3f38719b74

Change-Id: Iccd685618d79b3357944fc5278e072448a58376d