[automerger skipped] Merge "Freeze the networkstack-aidl-interfaces interface" into qt-dev
am: c2f1cc8b8e -s ours
am skip reason: change_id Ideabe73fc93bbefca2d624ee9ca190cf31419424 with SHA1 1232fe37be is in history

Change-Id: I39438b1a3204aa82550ac83117a96f7549d19e42