Merge "Merge "Remove stopship for IdmapManager vendor sdk" into qt-dev am: 034670e90b am: 24046b674c" into qt-r1-dev-plus-aosp
am: ed9de0d88e

Change-Id: Ice73ab06fb637b8e29f08489d38a04b35980ddcd