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