Merge "Skip OomAdjuster update in bindService for self-bindings" into main