Merge "Revert "Create exported mode flag library for package android.os""" into main