Merge "Remove unnecessary custom shadow of android.system.Os" into main