Merge "Fix ANR in Process com.android.shell after BR is finished" into main