Merge "Add null check for mTunerResourceManager in newly added APIs" into main