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

Change-Id: If634c504de6a11cf1e6fb8bdd3667b4fb0fd70f5