[automerger skipped] Merge "Add template listener for getting OEM netd" into qt-dev
am: 78f0b817 -s ours
am skip reason: change_id I2933eb09e5833a15507eecd898fb8d194098baa9 with SHA1 4315131c is in history
Change-Id: I7ffcfc99d5477b93496f7b46c158a63f6cfa1e48