Merge "Merge "Set idmap2 binary uid and gid after forking" into qt-dev am: ebad9125c8" into qt-dev-plus-aosp am: 802d1edc5a
am: 210af34818

Change-Id: I09b99a90b38cdbbbcbd3c3ac5075e7320b6c43f2