[automerger skipped] Merge "Merge "Make getdnsnetid returning app_netId instead of dns_netId and fix nits" into qt-dev am: ef525f6943 am: 093eefebf8" into qt-r1-dev-plus-aosp
am: cdc3195b83 -s ours
am skip reason: change_id I920cbc7b63790c4937acc56d1811fc04026e11fd with SHA1 6f61c9c5df is in history

Change-Id: Ic944f21cde27c2e5c3a3697f5168cbcf16bb91a9