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

Change-Id: I0e46e53028b7d0a057e305a744f0b15bc066cde9