[automerger skipped] Merge "Import platform SDK from build 5716442" into qt-dev-plus-aosp
am: 749bc13371 -s ours
am skip reason: change_id Ib5a5745b05fd068e03ec6c874cb587b00d2a4b39 with SHA1 100f8aa394 is in history

Change-Id: Icf2a9f2d85f20f6ba5601a46bec698b0f19971a2